Merge tag 'upstream/3.6.1_20160216'
authorGert Wollny <gw.fossdev@gmail.com>
Sat, 9 Apr 2016 12:18:06 +0000 (12:18 +0000)
committerGert Wollny <gw.fossdev@gmail.com>
Sat, 9 Apr 2016 12:18:06 +0000 (12:18 +0000)
Upstream version 3.6.1~20160216


Trivial merge